Remove conflict markers.
authorSoeren Sandmann <sandmann@redhat.com>
Mon, 23 Aug 2004 15:51:44 +0000 (15:51 +0000)
committerSøren Sandmann Pedersen <ssp@src.gnome.org>
Mon, 23 Aug 2004 15:51:44 +0000 (15:51 +0000)
commit7d71fa25941d431a503979c4230418522a6be1b5
treed1c1b17bbb31e8de43914be1825380677ba37270
parenta578e1134643b4076c34675cad79499b48eb7387
Remove conflict markers.

Mon Aug 23 17:33:52 2004  Soeren Sandmann  <sandmann@redhat.com>

* ChangeLog: Remove conflict markers.
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-6
ChangeLog.pre-2-8